Alumaprep & alodine the empennage and a few other parts. Wear gloves!
I do a set of rivet filling when I just want a mindless diversion. If I do a little at time it will not seem like so much. I not tracking the time filling rivets because I do it so randomly.